Merge from mainline.
authorJan D. <jan.h.d@swipnet.se>
Tue, 5 Jan 2010 14:42:39 +0000 (15:42 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 5 Jan 2010 14:42:39 +0000 (15:42 +0100)
commitf5fc622c1167b0c4f76339f8534f1908a7e7e3d1
treeb8ce066b6dd19a32689818a62bc35929a29f4066
parent82c9d2f9e00c6e79b9ca1bf01a010fe004d84bb2
parentf3bef602b191a5483440a80781b193cf6728fefd
Merge from mainline.
src/ChangeLog